Foxtrot Rework + Marine Reinforcements #6788

zc-byte-boxer · 2024-07-25T04:58:32Z

Marine Reinforcement + Foxtrot Rework

This is a PR that rebalance Foxtrot, making it a one time use, at a higher price, but giving more marines with a pop-scale mechanic.

As well, this adds at the nuke tier an option to call a nerfed ERT team for additional reinforcements.

Explain why it's good for the game

https://hackmd.io/@byte-boxer/BypH9VZd0

Outside of the design doc, we'vemade our rounds longer over the last year, but have progressively nerfed marine respawns. This PR adds more opportunities for the marines to respawn, while ridding the marines of the option to buy more powerful reinforcements.

Testing Photographs and Procedure

Screenshots & Videos

Tested on local. Can manually call ERTs, but everything isn't working yet.

Changelog

🆑 Byte-Boxer
add: Adds Beacon Reinforcements at Tier Four to the techweb. It allows marines to call, at the price of ten points, for nerfed versions of the UPP, VAIPO, Freelancer, and RMC ERT. One time use only.
del: Specialist was removed as a techweb buy, though kept in code incase admins wanted to spawn it.
balance: Foxtrot has gone through a major balance overhaul. It now is a one time use only, and costs more, but has a minimum spawn of 6, and at 100, 110, 120 pop, it gains 2 more members before maxing out at 12. Foxtrot no longer has a side spec that can be bought, but does have an SG.
/:cl:

Current Bugs

Beacon-Reinforcements is in the techweb code folder, but does not actually appear visible clientside when looking at techwebs.
These special ERTs need to have no minimum number to spawn, or need to relaunch if they fail to get anyone.
Spawning these ERTs as freed mobs if they're not all picked doesn't work currently.
Linters failure.

…emove repeat foxtrot

code/datums/emergency_calls/beacon-reinforcements/freelancers.dm

ihatethisengine · 2024-07-25T05:10:08Z

code/datums/emergency_calls/beacon-reinforcements/freelancers.dm

+	var/mob/living/carbon/human/mob = new(spawn_loc)
+	spawning_mind.transfer_to(mob, TRUE)
+
+	if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job && (spawning_mind)))


Suggested change

if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job && (spawning_mind)))

if(!leader && (!spawning_mind || (HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))))

and implement this for all the similar occurrences. Basically if you don't have a mind (a client willing to roll the role), you have no one to check for preferences.

code/datums/emergency_calls/beacon-reinforcements/rmc.dm

ihatethisengine · 2024-07-25T05:11:39Z

Didnt look through everything, but this should be good enough to start with

kiVts · 2024-07-25T05:45:50Z

code/datums/emergency_calls/cryo_marines.dm

-	max_engineers = 1
-	max_medics = 1
-	max_heavies = 0
+/proc/get_marines()


Highly suggesting to make a proper path for this. Right now anything and anywhere in the codebase can call this, does it need to be like that?
e.g.
/datum/emergency_call/cryo_squad/tech/proc/get_marines()
Also move it down below the /datum/emergency_call/cryo_squad/tech/ after the path is given.

kiVts · 2024-07-25T05:47:20Z

code/modules/cm_tech/techs/marine/tier4/beacon-reinforcements

add .dm at the end. its just a textfile now.

also swap the - with _

same for the folder you created

added .dm and changed it up. anything else?

kiVts · 2024-07-25T05:50:47Z

code/datums/emergency_calls/beacon-reinforcements/rmc.dm

+
+/datum/emergency_call/royal_marines/beacon/New()
+	..()
+	arrival_message = "[MAIN_SHIP_NAME], this is the HMS Kurtz of the Three World Empires. We've received your call and are enroute to aid."


Kurtz is a CBRN ship. Thunderchild is the HMS ship used in cm. You cal call it whatever though.

Suggested change

arrival_message = "[MAIN_SHIP_NAME], this is the HMS Kurtz of the Three World Empires. We've received your call and are enroute to aid."

arrival_message = "[MAIN_SHIP_NAME], this is the HMS Thunderchild of the Three World Empires. We've received your call and are enroute to aid."

HMS Patna and HMS Thunderchild are the TWE's ships.

changed it up to the HMS Thanes. I want to keep it as a different name than the other two ERT ships so I don't have to add anything to check if a ship name has been taken

The USS Kurtz map can be used for any USCM faction ERT, not just CBRN.

code/datums/emergency_calls/cryo_marines.dm

zc-byte-boxer · 2024-08-01T19:34:22Z

https://streamable.com/cy8zu9
Streamable

kiVts

rename this folder, replace the - with _. Adjust accordingly in dme file.

Otherwise I probably missed something

kiVts · 2024-08-07T01:07:31Z

code/datums/emergency_calls/cryo_marines.dm

+	var/pop_scale = 0
+	var/count = 0
+
+	for (var/mob/living/carbon/human/H in GLOB.human_mob_list)


if you want it to scale with server pop, use GLOB.clients, dont use for loop, just single var with length(GLOB.clients)

kiVts · 2024-08-07T01:18:05Z

code/modules/cm_tech/techs/marine/tier3/cryorine.dm

-	if(!SSticker.mode)
-		to_chat(M, SPAN_WARNING("You can't do this right now!"))
-		return
-


Why did you remove this

kiVts · 2024-08-07T01:20:04Z

code/datums/emergency_calls/beacon-reinforcements/vaipo.dm

+		name_of_spawn = /obj/effect/landmark/ert_spawns/distress_wo
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc)) return //Didn't find a useable spawn point.


no inline ifs

kiVts · 2024-08-07T01:21:08Z

code/datums/emergency_calls/beacon-reinforcements/upp.dm

+		name_of_spawn = /obj/effect/landmark/ert_spawns/distress_wo
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc)) return //Didn't find a useable spawn point.


no inline ifs, I know this is copypasted, but that code is also six years old.

kiVts · 2024-08-07T01:21:28Z

code/datums/emergency_calls/beacon-reinforcements/rmc.dm

+		name_of_spawn = /obj/effect/landmark/ert_spawns/distress_wo
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc)) return //Didn't find a useable spawn point.


kiVts · 2024-08-07T01:21:34Z

code/datums/emergency_calls/beacon-reinforcements/freelancers.dm

+		name_of_spawn = /obj/effect/landmark/ert_spawns/distress_wo
+	var/turf/spawn_loc = override_spawn_loc ? override_spawn_loc : get_spawn_point()
+
+	if(!istype(spawn_loc)) return //Didn't find a useable spawn point.


harryob · 2024-08-24T10:30:17Z

pr seems to be stale, let us know if you want it re-opening, or just make a fresh pr for it

Byte-Boxer added 4 commits July 16, 2024 10:42

removes cryo spec, buffs foxtrot up to 12, increases foxtrot price, r…

78f90fb

…emove repeat foxtrot

adds pop scaling to foxtrot

5027276

checkpoint on adding beacon reinforcements

20fb52a

draft_beacon_reinforcements

a4dacff

github-actions bot added Feature Feature coder badge Removal snap Balance You need to be a professional veteran game maintainer to comprehend what is being done here. labels Jul 25, 2024

zc-byte-boxer marked this pull request as draft July 25, 2024 05:00

ihatethisengine reviewed Jul 25, 2024

View reviewed changes

code/datums/emergency_calls/beacon-reinforcements/freelancers.dm Show resolved Hide resolved

ihatethisengine reviewed Jul 25, 2024

View reviewed changes

code/datums/emergency_calls/beacon-reinforcements/rmc.dm Show resolved Hide resolved

kiVts reviewed Jul 25, 2024

View reviewed changes

code/datums/emergency_calls/cryo_marines.dm Outdated Show resolved Hide resolved

Byte-Boxer added 2 commits August 1, 2024 12:29

updating beacon reinforcements PR

a7187a4

changing proc path

e18c54e

zc-byte-boxer marked this pull request as ready for review August 1, 2024 19:33

Byte-Boxer added 2 commits August 1, 2024 12:55

linters/makes loadouts work hopefully

e1d13af

hopefully fixing it for real this time

8cd7cf0

zc-byte-boxer changed the title ~~Draft: Foxtrot Rework + Marine Reinforcements~~ Foxtrot Rework + Marine Reinforcements Aug 1, 2024

Byte-Boxer added 5 commits August 1, 2024 19:52

maybe fixing linters

5e96ae8

maybe real now

22b555c

aw nuke

1863e77

runtime fixing for beacon hopefully

b6aaa31

fixes last runtime

68c945d

kiVts requested changes Aug 7, 2024

View reviewed changes

kiVts marked this pull request as draft August 7, 2024 01:49

harryob closed this Aug 24, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Foxtrot Rework + Marine Reinforcements #6788

Foxtrot Rework + Marine Reinforcements #6788

zc-byte-boxer commented Jul 25, 2024 •

edited

Loading

ihatethisengine Jul 25, 2024

zc-byte-boxer Aug 1, 2024

ihatethisengine commented Jul 25, 2024

kiVts Jul 25, 2024

kiVts Jul 25, 2024

kiVts Jul 25, 2024

kiVts Jul 25, 2024

zc-byte-boxer Aug 1, 2024

kiVts Jul 25, 2024

IroquoisLou Jul 25, 2024

zc-byte-boxer Aug 1, 2024

Steelpoint Aug 8, 2024

zc-byte-boxer commented Aug 1, 2024

kiVts left a comment

kiVts Aug 7, 2024

kiVts Aug 7, 2024

kiVts Aug 7, 2024

kiVts Aug 7, 2024

kiVts Aug 7, 2024

kiVts Aug 7, 2024

harryob commented Aug 24, 2024

	if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job && (spawning_mind)))
	if(!leader && (!spawning_mind \|\| (HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job))))

	arrival_message = "[MAIN_SHIP_NAME], this is the HMS Kurtz of the Three World Empires. We've received your call and are enroute to aid."
	arrival_message = "[MAIN_SHIP_NAME], this is the HMS Thunderchild of the Three World Empires. We've received your call and are enroute to aid."

Foxtrot Rework + Marine Reinforcements #6788

Foxtrot Rework + Marine Reinforcements #6788

Conversation

zc-byte-boxer commented Jul 25, 2024 • edited Loading

Marine Reinforcement + Foxtrot Rework

Explain why it's good for the game

Testing Photographs and Procedure

Changelog

Current Bugs

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ihatethisengine commented Jul 25, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zc-byte-boxer commented Aug 1, 2024

kiVts left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

harryob commented Aug 24, 2024

zc-byte-boxer commented Jul 25, 2024 •

edited

Loading